Removing useless handler