Trailing whitespace removed

Trailing whitespace removed and unused left removed.