removed matrix calculations
Remove arithmetic