some more clean up
Signed-off-by: Andrew Lemay