Revert "Code pro fixes"

This reverts commit 4658c6d76c7cc66ce4c2a48f16e3c5578ad852a0.