Revert "Various Additions"

This reverts commit a84230208979e387b21c29fb636b182d945ae676.
Various Additions