Cleaned up grunt tasks