add/remove stuff

Change-Id: I980721957d0d8d4c3798c1a6283e0244fbdfa3b2