Misc/Utilities clean up