Revert "felica wip wip"

This reverts commit e044bb3371adbda101ec56f33dfa035896316d56.
fix felica 2
fix felica wip
fix mismerge