Controller cleanup

The "[Reduced Warnings]" Commits eliminate warnings from clang.