standalone + cleanup not used stuff from build