Removed old variables and an include that wasn't needed