Added some todos and removed some unused methods