Feature html5 cleanup

after merge needs to be called in the appropriate place