Revert "Email + Merge"

This reverts commit a3a63d5a26470f6d2218956dd36f52087ecbd6a9.
Revert "Fixing Stuff"

This reverts commit 0a66b39373f469e467b16275e898010c182a265d.