Opened issues for TODOs and removed them from the code.