removing db stuff pt 3