cleanup, have only one removed state