Fix to make the vocabulary work with AT and FL at the same type
Separate logic from security control
removed unused code
fix syntax error
Fix broken upgrade step
Removed unused code