Initial code setup changes

+ Remove unnecessary code 
+ Fix grunt tasks