Minor changes: code simplification/removal

* Correction of adaptive-square signature.
* Removal of unnecessary usages of matrices' fns.