Clean-out, proper versioning, etc.