cleaned up first batch of using lines