Remove dead and unused code. Update to reflect the code review requests.
Attach a file by drag & drop or click to upload
