[PT, MP, GS] {other} - some cleaning