Some clean-ups; disable preserve-par property for now