Last code cleaning. Move to 1.5.