Removed recent breaking changes