fixed removal logic, and titles