removed old inefficient classes
minor typo