Remove unneccessary If block