revert version bump

Plus, remove a few unused modules/variables.