Revert "Made more additions and a couple of deletes."

This reverts commit 163c243d8339880da8946db8e4ca6e7fa4408695.