05.1 Remove global static vars