Remove Static, not going to be used