Removed debug controls again..