full class/unoptimized version
module cleanup/concat add