removed unused class, needs translation and internationalization. some
minor optimizations.