remove self-specific stuff