Cut out some unused functions