cleaning up ptcri and eep classes