Removed unnecessary if-statement