Remove debug info and tidy.