More cleanup. Removed warnings!