Add last check and remove methods