starting to cleanup validation