Clean-up useless stuff