Remove trailing spaces / closing php tag

Just wanted to get this into the upstream to match.