the never ending cleanup from one fucking commit