Removed useless handlers