cleanup; add file context for building