Clean

merging in the final version