further consolidated imports, removed linker phase