Cleanup some DRCs