[greg] remove james' wonderful additions