Commit before gutting all my specific code