fixed merge error
removed system debug hack