removed static cruft from previous generation