Remove cards file. Rename some utilities