cleaning up legacy