Fixed: Console [SEVERE] re SQL error
Tweak: Cleaned up some more unnecessary code