Removal of excessive handling code