[OS-BUILD PATCH 0/0] General cleanups