Clean up some dumb parts after further web components learnings