Removing redundant files, cleanup, codegen now in elderberry