Removed old include/link paths