automated clean up
resolved various TODOs
resolved various TODOs