commented out all J1.5 methods
Refactored and removed reference by variable to follow strict standards.