Found some lingering helper methods, new style hashes