First edit, removing the stuff we don't want, ready for the new stuff.
Merge pull request #1 from flashmedia/firstedits

First edit, removing the stuff we don't want, ready for the new stuff.