Remove Matrix stuff

Signed-off-by: Kevin <kevainxxx@gmail.com>