removing code for PC mode; bug fix in test
merge remove PC from master