This should probably be removed? Is this pull request ready to merge anyway?