Got rid of lots of unneeded shit in actual db class