Fixed issue: Removed not needed system/validation
Fixed issue: Removed not needed system/valid