Revert "PIE: this is an all inclusive commit for pie. Includes everything needed for pie'"

This reverts commit 74fef3beb483daa323f213b7fff8119e534ddb8f.