Removed legacy attributes from controller