Removed remaining references to MOYA