Cleaning up code after removing grunt