Reset to v31.0 and remove messy debug statements.