Fixed generation for browser and clean-up

Change-Id: I52204e74eaf5e0b65b275d1136ebd5c8886bec4c