minor changes, mostly cleaning up unused code. 


Signed-off-by: Michael Learo <mlearo@gmail.com>