removed some crusty stuff