Removing unused static