Removed circular dependency in grunt task