Major cleanup to reduce diff in respect to stable