Remove some redundant unused code and add TODO list

Applies to #150