another cleanup attempt