Minor fix and removal of unused file.