Got rid of all no warnings and rolled back on certain potentially error generating warning removal in previous commit.