Rich D: removed commented code (that reminds me of things)