Make methods static where it's possible

Change-Id: I09baf6491c84a5d4d6e3ab1261d474f7811e32d6