Removed SimpleCalc. Renaming it to something else