Cleaning my hive-engine