Abandon startup branch in favor of develop/startup