Removed temp stuff re new mechanism