No more of that hostname nonsense.  Also, trim extension