Remove generic cloning code for now - this code is not supposed to