Heavy cleanup
Clean up continues