Cleaning up hack