Removed some stuff moved to MPSA