reverting some mistakenly commented out 'using' statements