Remove method missing and refactor