Remove now uneccessary if condition