Remove static_site
Merge