Removal of unused properties and env vars