This complexity was all entirely unnecessary