Remove hard-coded lens components