1.9 : clean ups