Removed: unused variables