Removed service separation