Take out unnecessary if