cleanup #1227 pull