Feature/remove client thumbs