- cleanup code, prevent warning messages