Removed old includes and ran grunt