remove more LOC