Collection StaticBindings with big clean-up and huge empty structures detection improvements