Clean up the results of a blind copy-paste implementation