Remove unneccessary if condition