Remove messy code to focus on WebKit part