you are correct. I removed both classes from the core package.