Bumped version to 6.0

This PR contains my work towards 6.0. For now, it's more about some easy work to drop "old" stuff.