More cleanup, and got rid of old TODO