Cleanup

deletes a bunch of merged content.  makes repo DRYer