more lenses / import cleanups