Cleaned up remove_static_html