Cleanup favicon code