Cleaning up the hub