Removed trash couts and fixed all TODO's.