removed some more #4