Cleaned all.
Full commit.
Fixed conflicts.