Removed lots of cruft! Yay!