Remove nasty method