Removing old TODOs
Removing unused images