Removed specific references for instance options