Removed #TODO comments - converted to issues on GH