Clean up hack.