Fixed generation for browser and clean-up

Change-Id: Id729f70a7cef29598c3c5601de0eb6e8811b3a55