Remove trait bounds from struct definition

Update for the incoming changes