Fixed grunt tasks and clean up