remove more legacy code and note modules kept for reference (but unusable)