Removed some stuff I decided I didn't like.

Ask me tomorrow and I'll have changed my mind on that. :)