Remove ls only and fix trailing whitespace