removed unnecessary todos