Removed rubbish from base controller