remove new suggestion box and markup cleanup