Remove more stuff upon reset