Remove unused, commented code.  Fix filter hiding