removing some todo notes.