CHANGE: Issue #62 - grunt overhaul - remove old code