[PATCH 0/5] General cleanup