cleanup, remove old unused code which was only needed for initial p3k tests