Fix all jshint warnings except unused vars in orphaned code (will handle in later commits)
Removed orphaned method referencing non-existing var