more fixes for exit issues. Got remove working