removed comments related to TODOs already implemented