removed service, fixed mp