Revert "Added lots of stuff."

This reverts commit 547511cde9208f12c7b75169e36a618b398c2a9f.