removed TODOs and captured in GitHub issues