Removed unsafe code. Updated packages.