Removed unused function, make private functions static

Change-Id: Icbf4aeee6c350af31be3cf7d2a851dc61601e127
Made private functions static

Change-Id: I2353d0d286d1dedff26cff9db3643c2b51d2c0ba
Made private functions static

Change-Id: Ic118a90ce7a5a84e2bc52775013247d14ab90120
Merge topic 'Weverything' into master

1348962f Made private functions static
82a84473 Made private functions static
66693916 Removed unused function, make private functions static