OBANYC-2088 clean up