Deleted files which were meant to be deleted on merge from 8.28