removed some todo's