Removed old misc
Added client export function