Removed old unused functions which we used before the CPT solution.