Removed redefinition of M_PI