some more cleanup

Signed-off-by: Venkateswararao Jujjuri "<jvrao@linux.vnet.ibm.com>