Code cleanup to resolve grunt errors