new build and removed unused stuff