removed junk from controller