Remove unused elements, add site container