Removing experimental mess