build system + removed unused stuff