Moar adds and removes

Change-Id: Id536cb8f55f72a1f380e568919c2be83f5cba304