Fixed some memory leaks
Removed default generated comments