Remove leftover 'self' argument