Cleanup vendor_psd (2/3)

Conflicts:
	core/Makefile