Fix some more using. Untested as I don't have a Logic
More using cleanup