Cleanup of Paramics export code