Removed old classes which generated compilation problems