cleanup re #252