removed dodgy self