Remove remnants of implicit self