removed old include and data paths