Thunder Court Cleanup

Thunder Court Cleanup