Remove global reference in constructor