Remove legacy code to start it all over again!