removing some more returns