Removing unused vars; Comments