clean roomservice

Change-Id: I732ac07f2766f2c6de8f0bf382202b03a9c93b08