refactor plus remove/reset entries