Revert "CityScape Lab edit4"

This reverts commit 073189951402df116683bb92f9a7a3e61b55d31a.