removing conditional