Minor fix and remove unused files