Clean up of self host assembly, removed references and other garbage