take 1 on removing AWS-isms
rename for sanity
remove dead code