Code cleanup

removed a warning an some commented out code that is no longer relevant.