CON-1233 styles clean up