removed unnecessary prefixed properties