Removed deprecated and unused guider members and methods

Removed undocumented todos did some cleanup

Change-Id: I89718dac0a3f818bf6a01df1083f7d4c85a95fe7