1. remove singleton