remove irrelevant stuff and add minor fix to remote and header template