Updates TODOs
Removes unused packages