Removed usage of lenses which increased build time by 3 minutes!