removed TODO - some done, others moved to issues