Cleanup for Fascinate

Change-Id: I2b055493b5e846c316b1c8eb610dfec9ffbe79e4