Removed valid from/to for future use