[2.6] CS Fixes And Removed An Unused Import