Removed some unused vars and comments