updated todo
cleanup
remove unused libraries and cleanup