removing code for PC mode; bug fix in test