removed a couple of unused functions