Removing unused static funcs and moving existing statics to top of class