Added some player cleanup to fix crashing