Removed getService references

Replaced with @Parameter as necessary.