removed warnings
cleaned