Cleaning up useless stuff