removing some local cruft