removing db stuff pt 2