fixes #8469 - css cleanup, whitespaces and remove dead code

ditto scss