ExerciseProxy
Revert "ExerciseProxy"

This reverts commit 5db527ca9aba183de20aa5e149678521c1a7d918.