Remove some code dupe