Relocated and removed code.