Starting with cleanup.
Adaptions to master.