- removed old and unnecessary code