Web: Cleanup a few things