removed some todo comments