removed bunch of unused functions