Removed validation and SLD saving
Modified TCe and CEK validation