PSD: final cleanup