Removed code no longer needed
Added support for accessing global static class vars