cleanups to be backward compatible