Remove trailing s per #27