Remove needlessly complex logic