Reorganization & removal of instance access of static instances.