removed some 'TODOs'