cleaning up path definitions and other exports