Update Scion class, remove unused calls