Strip some logic to reduce complexity