Remmove kitchen from tree. Misc cleanup