Fix ISP upload/download bug & Clean up unused files