Removed TODO items

These items are being added to the main issues list, and will be addressed in a future release.