Fix alert messages and remove unused checkbox