Completing a few cleanup options

Not too much to follow