Revert "readded in other shit."

This reverts commit cbbd97f5d153e80f8a4a712f7ca24532a0f3ab5b.