cleaning up rogue stuff