Remove unused code
Remove TODOs
Reroute deprecated constructor