cleaned up after accidental merge from blog branch