Remove unused vars and comments