Cleaning up dumb shit