and move them inside the module, since they are not used anywhere else

Change-Id: I63a629c8a497f5fb832f5287c260df7eb15fed3a