Kicked some TODOs