added modules, working PDB clean