Removed static methods and cleaneed up stuff