removed redundant todos