Removed controllers and fixed experimental bug