version bump and removed duplicate code