cleanup, build working