Removed old static methods and changed to instanced