S4C cleanup