Removed old inner classes