Removal of unnecessary test