0.30.0-develop compatibility and modules cleanup