Removed unused vars. #1424