removed warning
cleanup
cleanup and removed warnings