Revert manager changes
Complete remaining TODOs
cleanup