further cleanup of buildall