Remove unused files and bring in EOF fix