Massive cleanup :lipstick: