#1295 Removed unused variables