Removed all user ID params from service layer, closes #23