Remove or synchronize remaining statics