Removed some unnecessary code
Merge branch 'master' of github.com:abhiyerra/keymaster