Remove copy-pasted code (more to be removed)