WPML implementation improved

also removed old code and references