Clean up the new code