Remove unused statics