Removed stupid Calculator controller