Final cleanup

Cleanup a few things I missed here and there

Signed-off-by: Rashed Abdel-Tawab <rashed@linux.com>