Removed some crashing stuff again