removing more dead code
removing dead code in venues
comments, cleanup