Removing unused content

@rcruz: I don't think any of this content is used. I did some admittedly poor testing, you should be able to confirm it fairly quickly