Cleanup and use proper cloning