removed old school stuff