removed pre-gen cruft