deleted TODOs and should be ready for merging