Minor clean up (remove unused vars).