Changes in whereAmI and classes removed