Removing cloning and firing off events