Removing TODO that is done