Cleaned up some left over commented out code and made a few methods static.

Change-Id: I2b386d67c9427e4b39a05a4089b6baadaedd918b