Changing to follow releases plus some cleanup.