removed the db stuff