Removing psy6 and dependencies