removed two todos