Added cleanup for input module
Merge pull request #315 from TheNeikos/add-input_cleanup

Add input cleanup