removed old variable and functions