Remove 1.7 and cleanup to get a better overview.