Fix progress and remove unused files