Remove backward compatiblity code