Made some minor changes, removed un-required code. 
 - Matrics removed. 

Pushed to Beta 2.

Signed-off-by: Wendell <Wendell@WMISIEDJAN-PC>