mid clean up
Clean-up mostly completed