Home table controller cleanup