Removed 2.5 support in master