Removed if-statement