Remove trailing whitespace :-(
Remove redundant type witnesses