GH #258 - Removing old helpers.