HIVE cleaned up marker adding/removing