Remove source/target compatability