removed warnings and messages