removed some unused handlers