Merged in Clean branch

No need for the clean any more