[with umkogut and araujot] Fixing warnings and removing unnecessary code/comments