removed some empty handlers