Remove: code smell