Removed constants that were transferred to MPSA