Code cleanup

removing dead code, commented code and System.out