Remove unused JDBC code

(Comment out)
Comments and address unused code

Refactor a repeating if statement
Continue enum transition

Also remove commented out code and whitespace