Removed completed TODOs
Removed dev values