Moved stuff around and removed unnecessary things