Remove dependency on client-side-only class. Started more things.