removed some commented out code in matrixMap and numerous commented out chunks from when before users was global