removed some unpleasant stuff