Fixes/ Removed Simple Calculators