Doing a deep clone on includes/dao objects can be very slow
Cleanup in 830