Remove crufty stuff