Remove annoying bottleservice

Change-Id: I1c35f585024717bdefdd4156a74fc536e5f6bf91