Removed systemservice wrappers