sf 2.4
Remove duplicated layout
Remove deprecated method use