Added option to specify language. Removed unused code.