Clean up for project and new sensormanager code