MDL-40230: MASTER CSS Minor Fix
MDL-40230: MASTER Removing deprecated code