clean up for epam pp