Cleaning up some static references
Oh god merges.