Revert "Phase I"

This reverts commit 4619506a147292f83cb6d88ef5e016870bff40b1.
Phase I