I'm not comfortable at all having legacy code here... Legacy code should go in the legacy bundle.