refactoring. Kernel classes removed from context