Removing pointless things that caused warnings.