Revert "Cosmectics changes"

This reverts commit c41cb23d8a6dbad811a97dc063216388c91cded6.