Removing 0.6x support