Remove db stuff, add some things for training user