CitySDK mixin cleanup