Removed code duplicated on cs server