Clean up, fix missing proprietary files