Remove dependency on lens-family