remove warnings from handlers