Actually remove all db references