Remove button now correctly enabled