MABetterPickers

Changes:
- remove unused classes