More += cleanup