Remove files that do not belong in the repo

Remove screenshot files that do not belong in the Git repo.
Clean up javadoc comment that included a merge conflict.