Removed leftovers from copying