Revert "Start development of vendor PSD (4/5)"

This reverts commit c4ff46708e26e72e5978eaccbec9d1eb3b063dfe.

Conflicts:
	core/Makefile