Cleanup of poly an numeric modules

Removed some test code