removed some more unfinished code