removed code seperating client and server components