Cleaning up some references to hack