more cleanup; removing check (since this does not depend on pivotal)