Clean Commit History

[albsch]

Clean up commit history for easy comparison to the upstream project. Create new pull requests with old commits.

Split into three big chunks:

• Feature removals
• Changed conventions
• Upgrades