To be perfectly frank, I would quit without even looking back if they removed the armory system. I think many of the issues people have with the armory system - not having a defined direction, lack of feeling unique - are issues which can be resolved with some simple mechanics.