Removed old classes from core init file