removed modules; too hairy for this release