Bugfix: remove unused copy-pasted code