Address PR comments

Revert dev