Removed remaining web logic from application.