More cleanup. No actual need for PIL anymore