Fix ordering and remove neutron workaround