no more halo

Change-Id: I8a5f494b90dbc2bf8c21c1a9cfff210c63e5b538