more general cleanup