Remove unused static method and properties