More removal of uneeded components for the crash