3.0 - Removed unused variables