Cleanup path overrides