psci alive again, some cleanup