Remove some leftover copy and paste stuff