Deactivated PSP build and refactored build conditions