Remove unused modules
Improve comments and add TODOs to work on