Removing cruft (targeted because of pdb stuff--even in comments :) )