Cleanup for new code