More cleanup of idiocy