removed further superfluous instances
Merge branch 'further-cleaning' of https://github.com/jvoigtlaender/afp into jvoigtlaender-further-cleaning

Conflicts:
	battleships/Settings.hs