added removal of import statements and empty function to de-qualify fully qualified variable names