Remove weighting from interface / functionality is commented out in the classes and templates