Kept only the core module