cleanup w1-s4 - drafted the complements