formatting, removing dead code
removing more dead code