SFM: Removing already existing matrix tools