Cleaning Up Script (pt 2)

Focus on cleaning up database script (not done yet), currently just
commented out obsolete code and put it at the bottom, will delete in
last iteration on the database. Also put the classes and enums at the
bottom of the code as well, all together (in database script)