Cleanup for modular version