Clean ups and fixing compress again.