Tidy: old outdated commented out code
Modify: version bump