removed some unwanted things