Removal of the lens dependency