#298 Removed validation adapters, added validation messages everywhere they are used