Remove autogened shanigans