Improve schema drop code

Really struggled to get this section working in my environment which isn't using default postgres username.  Thought this solution was simpler, may not cover all scenarios though...