Removed dead code
Cleaned up code and added translation