Removed vestigial holdovers