Pre-PR cleanup