Remove testing code, merge from live