Reverting to use clone module for cloning