removed DB stuff