Todo

added some todos and deleted unussed code