Removed class short access syntax

Change-Id: Idbbbcbb079a08229ac0c39ed2cc94344012e27ca