Cleans up some missed commented out code and removes some warnings seen during compilation on Mono 2.8
3 files changed