Cleanup

Better to check each commit.

ready to be merged.