removed a number of unused functions