L5 Optimization not working properly. Commented out it as for now. Did some L5 code clean up and single point filer optimization