Remove unused import and duplicated return [MJ-562]