remove unused variables, useless comments, noise; make the file a bit more portable between distros