three todo comments were removed