Removed dependencies on pre-6.5 formatting