Remove unused Domain/Server classes
Add run task