Revert "Quick Fixes [2] IAA / Psych's Office"

Reverts jamiedigweed/NSS-Phoenix#14