cleanup and consolidate F2LCard stuff