Remove files - will be ported to 2.5 branch