Fully functional more stuff was cleaned up.