do some cleanup, BTW the previous commit was a fucking disgrace to mankind