Cleaning unused vars and removed unnecessary comments