Code cleanup for versioning that results in less code