Cleanup the Kitchen

/cc @sersut