remove validate method
correct dummy code
Merge branch 'cleanup' into dev