Remove unused boilerplate
Fix URLs