Removed TODO tag(s)