Removed objects breaking Swift operability

Change-Id: I6ce426424d9da40ae3381579a2d65559fc260090