cleaning + fixed collision crash