cleanup; removing GP dependency