removal of static access - can lead to evil

Change-Id: Iae51a7f16dfcad923b0a88b656310f322d5dfe4a