cleaned up some DBO stuff (got rid of commented out classes, etc)