Cleanup of Honeybee stuff