Huge janice vendor cleanup