Commercial space clean-up service could be ready in 2024