Moving stuff to obsolete code