removing some todo