cleanup useless handlers