more cleaning up
added trigger_number and token_number to the information that is stored for every hit
removing more obsolete files