Revert "Inputcleanup"
Merge pull request #3 from Earlgoisman/revert-2-inputcleanup

Revert "Inputcleanup"