SSR: code cleaniiing