AL: 1. Removed old unsupported or useless cases
    2. Tested and fix a few others