Removed some crashing code