Finally clean up fuckup