removing some unnecessary static access