REVIEW: Even more webresource cleanup