Fixed methods displaying CPT
refactoring: removed commented code