house cleaning of prototype troubleshooting code