Drop a useless import and use `Self` in return values in Features