Removed redunancy in a few files and removed grunt.js as it is no longer
used