Cleaned up some DB classes