Remove unnecessary stuff for Computing Shield test plan