Clean version

Change-Id: I552af5f9dce749002ea65cc69c6f7724c6b9cc75