removed older code
fix jshint style nits