remove favicon
Refactor to simplify