Move environment into App, kill a class.