removed some weird and unused functions