remove legacy support code