Cleanup for new hubo-ach