Remove unnecessary coreapi calls

Change-Id: Ifd9add6da58c79ff49f85cfcff11d58f9c4422cd