Removed dead code
Updated tests
Interned strings