cleanup + added condition for uberspace