Removed large amounts of superfluous code.

Why oh why did I do that?