erased smart.* and fixed branding problems