Closes #3 - Removing servicemodel specific assembly