Removed alerts
Fixed validators