No need to move to next version when upgrading (actually causes a bug with new refactor). Clean up code (remove unnecessary doc comments).