deleted and cleanup
commit