Remove unrequired TODO