remove dumb defaults
validate and shrink code