Removed a lot of unused static helper methods