minor fixes + removed proprietary files for the moment