Added validation and remove site