[PATCH 0/7] Code cleanup 2