Removed un-needed code from TAPSHandler