next batch o cleanups.

Signed-off-by: revelator <ralphengels@gmail.com>